Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Sat, 10 Jul 2010 10:34:43 +0000 (10:34 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Sat, 10 Jul 2010 10:34:43 +0000 (10:34 +0000)
commitbc1c80aa5ea655bbc14da95630f2adafabae3efb
treee05aad935f4d52865acd163f21c4755c9dfaf184
parentdc4bb57311a841fae5b5a524c613c890a45dcbeb
parent5ad82aba7482f9bba850294b56644bd14c4752c0
Merge from mainline.